55bf6f
@@ -50,7 +50,14 @@
public class ChannelTransport extends JGroupsTransport {
 
     @Override
     protected void initRPCDispatcher() {
-        this.dispatcher = new CommandAwareRpcDispatcher(this.channel, this, this.globalHandler, this.getTimeoutExecutor(), this.timeService);
+        this.dispatcher = new CommandAwareRpcDispatcher(this.channel, this, this.globalHandler, this.getTimeoutExecutor(), this.timeService) {
+            /* Workaround for ISPN-6768 */
+            @Override
+            public void stop() {
+                super.stop();
+                this.channel.removeChannelListener(this);
+            }
+        };
         MarshallerAdapter adapter = new MarshallerAdapter(this.marshaller) {
             @Override
             public Object objectFromBuffer(byte[] buffer, int offset, int length) throws Exception {
